Refactored version of _gdk_quartz_window_find_child_by_point, that doesn't

2007-05-28  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkprivate-quartz.h:
	* gdk/quartz/gdkwindow-quartz.c (find_child_window_helper)
	(_gdk_quartz_window_find_child): Refactored version of
	_gdk_quartz_window_find_child_by_point, that doesn't return any
	coordinates as the users of this function already have the
	coordinates and need to translate them differently.
	(_gdk_windowing_window_get_pointer): Fixup coordinate translation.
	(_gdk_windowing_window_at_pointer): Likewise.

svn path=/trunk/; revision=17968

diff --git a/ChangeLog b/ChangeLog
index 4562e51a4fea437b63d42af118e78961ab6b9833..d7fb861fc26c90ff907916134188b704dd87a4f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-05-28  Richard Hult  <richard@imendio.com>
+
+       * gdk/quartz/gdkprivate-quartz.h:
+       * gdk/quartz/gdkwindow-quartz.c (find_child_window_helper)
+       (_gdk_quartz_window_find_child): Refactored version of
+       _gdk_quartz_window_find_child_by_point, that doesn't return any
+       coordinates as the users of this function already have the
+       coordinates and need to translate them differently.
+       (_gdk_windowing_window_get_pointer): Fixup coordinate translation.
+       (_gdk_windowing_window_at_pointer): Likewise.
+
 2007-05-28  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkevents-quartz.c

diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index 31d7e3ac549ec80bbb75800e55d96a46fb06c399..df676737aa0145f6027838daa4359bc218d3e6dc 100644 (file)
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -140,6 +140,9 @@ GdkWindow *_gdk_quartz_window_find_child_by_point   (GdkWindow *toplevel,
                                                     gint      *x_ret,
                                                     gint      *y_ret);
 gint       _gdk_quartz_window_get_inverted_screen_y (gint       y);
+GdkWindow *_gdk_quartz_window_find_child            (GdkWindow *window,
+                                                    gint       x,
+                                                    gint       y);
 
 /* Events */
 void         _gdk_quartz_events_update_focus_window   (GdkWindow *new_window,

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 3841c3ab22d1b45a6c7806c2a4fb5ede03667ce2..31f2b01a39edfa128c084bbc590392ed63870d47 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -442,6 +442,60 @@ _gdk_quartz_window_get_inverted_screen_y (gint y)
   return rect.size.height - y;
 }
 
+static GdkWindow *
+find_child_window_helper (GdkWindow *window,
+                         gint       x,
+                         gint       y,
+                         gint       x_offset,
+                         gint       y_offset)
+{
+  GList *l;
+
+  for (l = GDK_WINDOW_OBJECT (window)->children; l; l = l->next)
+    {
+      GdkWindowObject *private = l->data;
+      GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
+      int temp_x, temp_y;
+
+      if (!GDK_WINDOW_IS_MAPPED (private))
+       continue;
+
+      temp_x = x_offset + private->x;
+      temp_y = y_offset + private->y;
+      
+      /* FIXME: Are there off by one errors here? */
+      if (x >= temp_x && y >= temp_y &&
+         x < temp_x + impl->width && y < temp_y + impl->height) 
+       {
+         /* Look for child windows. */
+         return find_child_window_helper (l->data,
+                                          x, y,
+                                          temp_x, temp_y);
+       }
+    }
+  
+  return window;
+}
+
+/* Given a GdkWindow and coordinates relative to it, returns the
+ * window in which the point is. The returned window will be in the
+ * same subtree as the passed in window (including the passed in
+ * window), if no window is found, NULL is returned.
+ */
+GdkWindow *
+_gdk_quartz_window_find_child (GdkWindow *window,
+                              gint       x,
+                              gint       y)
+{
+  GdkWindowObject *private = GDK_WINDOW_OBJECT (window);
+  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
+
+  if (x >= 0 && y >= 0 && x < impl->width && y < impl->height)
+    return find_child_window_helper (window, x, y, 0, 0);
+
+  return NULL;
+}
+
 static GdkWindow *
 find_child_window_by_point_helper (GdkWindow *window,
                                   gint       x,
@@ -1238,11 +1292,11 @@ _gdk_windowing_window_get_pointer (GdkDisplay      *display,
                                   gint            *y,
                                   GdkModifierType *mask)
 {
-  GdkWindow *toplevel;
-  GdkWindowImplQuartz *impl;
+  GdkWindowObject *toplevel;
   GdkWindowObject *private;
   NSPoint point;
   gint x_tmp, y_tmp;
+  GdkWindow *found_window;
 
   if (GDK_WINDOW_DESTROYED (window))
     {
@@ -1252,40 +1306,52 @@ _gdk_windowing_window_get_pointer (GdkDisplay      *display,
       return NULL;
     }
   
-  toplevel = gdk_window_get_toplevel (window);
-  impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (toplevel)->impl);
-  private = GDK_WINDOW_OBJECT (window);
+  toplevel = GDK_WINDOW_OBJECT (gdk_window_get_toplevel (window));
+
+  *mask = _gdk_quartz_events_get_current_event_mask ();
 
-  /* Must flip the y coordinate. */
+  /* Get the y coordinate, needs to be flipped. */
   if (window == _gdk_root)
     {
       point = [NSEvent mouseLocation];
+      x_tmp = point.x;
       y_tmp = _gdk_quartz_window_get_inverted_screen_y (point.y);
-      *mask = _gdk_quartz_events_get_current_event_mask ();
     }
   else
     {
-      NSWindow *nswindow = impl->toplevel;
+      GdkWindowImplQuartz *impl;
+      NSWindow *nswindow;
+
+      impl = GDK_WINDOW_IMPL_QUARTZ (toplevel->impl);
+      nswindow = impl->toplevel;
+
       point = [nswindow mouseLocationOutsideOfEventStream];
+      x_tmp = point.x;
       y_tmp = impl->height - point.y;
-      *mask = _gdk_quartz_events_get_current_event_mask ();
     }
-  x_tmp = point.x;
 
-  while (private != GDK_WINDOW_OBJECT (toplevel))
+  /* The coords are relative to the toplevel of the passed in window
+   * at this point, make them relative to the passed in window:
+   */
+  private = GDK_WINDOW_OBJECT (window);
+  while (private != toplevel)
     {
       x_tmp -= private->x;
       y_tmp -= private->y;
-    
+
       private = private->parent;
     }
 
+  found_window = _gdk_quartz_window_find_child (window, x_tmp, y_tmp);
+
+  /* We never return the root window. */
+  if (found_window == _gdk_root)
+    found_window = NULL;
+
   *x = x_tmp;
   *y = y_tmp;
 
-  return _gdk_quartz_window_find_child_by_point (window,
-                                                point.x, point.y,
-                                                &x_tmp, &y_tmp);
+  return found_window;
 }
 
 void
@@ -1304,11 +1370,40 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
                                  gint       *win_y)
 {
   GdkModifierType mask;
+  GdkWindow *found_window;
+  gint x, y;
+
+  found_window = _gdk_windowing_window_get_pointer (display,
+                                                   _gdk_root,
+                                                   &x, &y,
+                                                   &mask);
+  if (found_window)
+    {
+      GdkWindowObject *private;
+
+      /* The coordinates returned above are relative the root, we want
+       * coordinates relative the window here. 
+       */
+      private = GDK_WINDOW_OBJECT (found_window);
+      while (private != GDK_WINDOW_OBJECT (_gdk_root))
+       {
+         x -= private->x;
+         y -= private->y;
+         
+         private = private->parent;
+       }
+
+      *win_x = x;
+      *win_y = y;
+    }
+  else
+    {
+      /* Mimic the X backend here, -1,-1 for unknown windows. */
+      *win_x = -1;
+      *win_y = -1;
+    }
 
-  return _gdk_windowing_window_get_pointer (display,
-                                           _gdk_root,
-                                           win_x, win_y,
-                                           &mask);
+  return found_window;
 }
 
 GdkEventMask